From: Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
Date: Mon, 24 Feb 2014 18:26:46 +0000 (+0000)
Subject: location: Adapt to new Geoclue agent interface
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~2703
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8b866efe92404588e47932368a8af606af01af1d;p=gnome-shell.git

location: Adapt to new Geoclue agent interface

To be able to correctly setup dbus policy, I had to change the expected
agent D-Bus API a bit: Now object path is fixed and not different for
each user.

https://bugzilla.gnome.org/show_bug.cgi?id=725082
---

diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index a202addf2..6498a5eb9 100644
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -52,11 +52,8 @@ const Indicator = new Lang.Class({
         this._item = new PopupMenu.PopupSubMenuMenuItem(_("Location"), true);
         this._item.icon.icon_name = 'find-location-symbolic';
 
-        var credentials = new Gio.Credentials();
-        var uid = credentials.get_unix_user();
         this._agent = Gio.DBusExportedObject.wrapJSObject(AgentIface, this);
-        this._agent.export(Gio.DBus.system,
-                          '/org/freedesktop/GeoClue2/Agent/' + uid);
+        this._agent.export(Gio.DBus.system, '/org/freedesktop/GeoClue2/Agent');
 
         this._item.status.text = _("On");
         this._onOffAction = this._item.menu.addAction(_("Turn Off"), Lang.bind(this, this._onOnOffAction));